Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 15:53:59 +0000 (07:53 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 15:53:59 +0000 (07:53 -0800)

Trivial merge